from trunk
authorKenichi Handa <handa@m17n.org>
Fri, 5 Feb 2010 07:14:26 +0000 (16:14 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 5 Feb 2010 07:14:26 +0000 (16:14 +0900)

Trivial merge